linux: user user_mode_vm() in place of user_mode() where necessary.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
index 78e9ad092ac4d73b3be822e1b23150f540e92af2..7c0c2984fa7dcc763afbdc1c04ab56a5263a74cf 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
@@ -708,7 +708,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        if (delta_cpu > 0) {
                do_div(delta_cpu, NS_PER_TICK);
                per_cpu(processed_system_time, cpu) += delta_cpu * NS_PER_TICK;
-               if (user_mode(regs))
+               if (user_mode_vm(regs))
                        account_user_time(current, (cputime_t)delta_cpu);
                else
                        account_system_time(current, HARDIRQ_OFFSET,
@@ -722,7 +722,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        /* Local timer processing (see update_process_times()). */
        run_local_timers();
        if (rcu_pending(cpu))
-               rcu_check_callbacks(cpu, user_mode(regs));
+               rcu_check_callbacks(cpu, user_mode_vm(regs));
        scheduler_tick();
        run_posix_cpu_timers(current);
        profile_tick(CPU_PROFILING, regs);